bitkeeper revision 1.1159.7.1 (41174951klGy2QEbQWYmrGAtzPji9A)

Merge

diff --cc linux-2.4.26-xen-sparse/arch/xen/kernel/setup.c
index 87fbefd1c9c9007f87ebb173531e0c5866c92651,c26e9bb2ef11b5e4d4490eb83dea97165de48170..41edb54702729bbabcd43154c13c38517e9e79b8
--- 1/linux-2.4.26-xen-sparse/arch/xen/kernel/setup.c
--- 2/linux-2.4.26-xen-sparse/arch/xen/kernel/setup.c
+++ b/linux-2.4.26-xen-sparse/arch/xen/kernel/setup.c
@@@ -202,9 -194,8 +202,10 @@@ int xen_module_init(struct module *mod
  
  void __init setup_arch(char **cmdline_p)
  {
 -    unsigned long bootmap_size, start_pfn, max_low_pfn;
+     int i,j;
 +    unsigned long bootmap_size, start_pfn, lmax_low_pfn;
 +    int mem_param;  /* user specified memory size in pages */
 +    int boot_pfn;   /* low pages available for bootmem */
  
      extern void hypervisor_callback(void);
      extern void failsafe_callback(void);

diff --cc tools/libxc/xc_private.c
Simple merge

diff --cc xen/arch/x86/domain.c
Simple merge

diff --cc xen/include/hypervisor-ifs/hypervisor-if.h
Simple merge